From d9bb439c891f464859a43c923feb64ac0c66451d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Tue, 11 May 2010 16:59:15 +0200
Subject: [PATCH] Remove deprecated GtkObject macros

Remove GTK_OBJECT_TYPE() and GTK_OBJECT_TYPE_NAME(),
G_OBJECT_TYPE() and G_OBJECT_TYPE_NAME() should be used instead.
---
 docs/reference/gtk/gtk3-sections.txt   |  2 --
 docs/reference/gtk/tmpl/gtkobject.sgml | 13 -------------
 gtk/gtkobject.h                        | 23 -----------------------
 3 files changed, 38 deletions(-)

diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index e85b94290c..bdf2fb45ec 100644
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -2248,8 +2248,6 @@ GtkNotebookTab
 <FILE>gtkobject</FILE>
 <TITLE>GtkObject</TITLE>
 GtkObject
-GTK_OBJECT_TYPE
-GTK_OBJECT_TYPE_NAME
 GtkObjectFlags
 GTK_OBJECT_FLAGS
 gtk_object_destroy
diff --git a/docs/reference/gtk/tmpl/gtkobject.sgml b/docs/reference/gtk/tmpl/gtkobject.sgml
index cb39a8cbf6..5a3f5b7a7b 100644
--- a/docs/reference/gtk/tmpl/gtkobject.sgml
+++ b/docs/reference/gtk/tmpl/gtkobject.sgml
@@ -109,19 +109,6 @@ if all references are released.
 
 @object: the object which received the signal.
 
-<!-- ##### MACRO GTK_OBJECT_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO GTK_OBJECT_TYPE_NAME ##### -->
-<para>
-
-</para>
-
-
 
 <!-- ##### ENUM GtkObjectFlags ##### -->
 <para>
diff --git a/gtk/gtkobject.h b/gtk/gtkobject.h
index bb141c3d19..b20f249927 100644
--- a/gtk/gtkobject.h
+++ b/gtk/gtkobject.h
@@ -51,29 +51,6 @@ G_BEGIN_DECLS
 #define GTK_IS_OBJECT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_OBJECT))
 #define GTK_OBJECT_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS ((object), GTK_TYPE_OBJECT, GtkObjectClass))
 
-/* Macros for extracting various fields from GtkObject and GtkObjectClass.
- */
-#ifndef GTK_DISABLE_DEPRECATED
-/**
- * GTK_OBJECT_TYPE:
- * @object: a #GtkObject.
- *
- * Gets the type of an object.
- *
- * Deprecated: 2.20: Use G_OBJECT_TYPE() instead.
- */
-#define GTK_OBJECT_TYPE                   G_OBJECT_TYPE
-/**
- * GTK_OBJECT_TYPE_NAME:
- * @object: a #GtkObject.
- *
- * Gets the name of an object's type.
- *
- * Deprecated: 2.20: Use G_OBJECT_TYPE_NAME() instead.
- */
-#define GTK_OBJECT_TYPE_NAME              G_OBJECT_TYPE_NAME
-#endif
-
 /* GtkObject only uses the first 4 bits of the flags field.
  * Derived objects may use the remaining bits. Though this
  * is a kinda nasty break up, it does make the size of
-- 
2.30.2